Updates by swirtex