changes made for feature based logic