Refactored 2 for testing
fixes...