Updated stuff, bit late I guess