merge some stuff in