modified classes & comment some line of codes...