merge
use correct helper functions