with changes bug fixes