got rid of stupid enum crap