final version for jan