Updated for testing and coverage