adding some logs here and there would be awesome