trying to fix it better