Updates thanks to cj for the updates!