This is a ChariTi enhancement version by me, I have added more features within ChariTi framework :)