V2

Finished v2 modification