Big fix and update