got rid of extra code for subjects