cut down more code