Added the rest of the features + stripped the line before loading the data