Updates by Guilspare