changed types to int