Added changes by Serjinis