BUG: taken out unwanted lines