Updated solution for Gas_Station problem