just added some new feature. Might have a bug too. Can u review it?