Fixin Omar's code...