fixup! ticket:2. Important improvements explained below;