removed some commented out versions