Added training and testing