Fixing time & creating v2