Jason's improvements