updated to fit redesign