I think I made all changes but I will test it better tomorrow morning before updating.