updated(khaleel) branch