adding serve feature