Changed according to Jason's comments