Added changes as given by Huseyin.