Fixed Coms by Omar