removed hard code.. or did I?