removed a few more lines