Changed rules to be more flexible for us for now