Updates by Phynova