FIX: merge some things