Better name, made sure everything was right