deleted unnessasary codeparts