little changes
created namespace and more control