changed types, less cluttered