Removed a little hardcoding