Removed and change some functions