Fixed float issue / added more columns