Update everything to function properly