added modification. Hopefully shld work