Last update before cleaning up the code