fixing lines removed
merg with master