Changed parameters to be shorter