ugh. undid function definition changes