updates to what we want in version 2