- Simplified implementation and removed debug log messages