Removed all the hardcoding