major improvement - added new features