Kunal refactor ish