T4  Ahmed 4.1 4.2

issue #155 #257 
@karim-elbawab @osherifo @MennatallahElKharbotly @omartarek please review