Commented out original code, added new. Testing