Updates by Colorifix