Code updated for static training, tests not done yet