Added flags - need to delete as appropriate