Update - removed some unnecessary lines