Changes proposed by Omar