last update before upadting to 1.8