C3 dayna161193 #83 like

@mohammad-abdulkhaliq @marwa-mehanna 
Please review :D