Removed hardcoded stuff