some changes
removed localstore and few changes