changes from namespace addition