moving to standard design