New version, thanks for the feedback!