Updates by parspeyab