fixes namespace, and code