Overhaul on request to try to simplify them further