Updated so stuff doesn't suck