Updates by T-Maharab