More work in progress, change the line num