implemented new feature

please review it