More lines + little modifications