I'll do some changes and be back with a 3rd version of the CS.