Improvements by loic84