integrated my work with hala and fully working

@Tharwat7