Fixed integration with refaker; merged