removed last two lines