New features, bug fix, refactoring.