#end of added by Adrian for Kaypic