starting to make Jaye's changes