refactor the WHOLE jersey code, from version 1 to version 2