Update and include some stuff