trying to fix things up after faulty merge