Continue the rework. The fun will soon begin !