added by and bz to all code