Revised training

Training updated, still needs tests