small changes to make it CeR proof