removed warnings, and added an old code (for debug / comparison)