update again to fix and make it better