changes for extra flags