Added now cases and added new options for training