fixed omar errors