Fixed issue and added Kinman suggest code