Took Ben's shortcuts