more code compatting