Removed hardcoded parameters