Updates by Shumrinka