do it correctly this time