Assefaw's changes