done with v1 changes pretty sure