Bug corrected, IA optimized