Made it less hardcoded