Improvements and piriti upgrade