implemented new carpool functionalities
merging