removed some lines that dont need