Finally done with new features