Catch bugs

Adaptation to school entry