original code + fixes + enahancement patches