Updated, added some stuff