Lets remove these hardcoded values