get rid of hard code issues