Updates by Pulsalys