tweak to remove roderik stuff