Finally updated, I'm getting lazy with this crap