getting stuff working again after merge