+ improving panic algorithm
+ improving panic algorithm