Updates by huliot cleargrey