1.7 Made parameters more readable