Adding override flag and moved some user functionality around