Added changes from achilikin