refactoring
prepare the ground for end-to-end
minimal version of both conversions