Updated with Jason's changes