Updates by Uniq solutionz