Small changes regarding data type and name