Bug fixes and started implementing new feature