started modifying code