Fixed that stuff Omar wanted fixed