Added more garage functionality