Switched all based on marc's redesign