Made some changes, havne't bug checked