Tested some improvements and they work fine.