moved stuff out of design