Now it handles line numbers