Updates by Aqaix