Updated everything, now working