fixed the part in branch1 where the location was wrong (jc instead of pasir ris drive)