made changes to clean this up