big change n parsing logic passing