added a check for shouldArrange