Modified and cleaned up the versions, prod v1