Added all handling for 2 flags. Code coverage ^^