By Aihrus updates