updates, updates everywhere, but no working end result :)