Cleaned up and re-introduces the original noise generator