sanity checing - removed some refactoring