Further code extention, some rework #2