changes to facilitate good deployment