Working allright with old jersey implementation
Polishing.
Additional formatting