Added another forms and change some codes