removed commented out return for testing