Mahmoud adding removed master stuff

@BeshoSmile @mohamedahmedawad93 please review and merge the removed stuff !