changes made to pass tests and further increase conversion quality