0.5.4 performance improved