Actually do it right