Updates by Sadyt