final fine tuning for spring class version