Added flags, this may be final commit