v3 - added a bunch