implement namespace changes as per suggestion