V2 refactored egypt