New Feature and Bug Fixes