polished and bumped version