Final V2.1 - removing debug lines