Added another forms and change some codes

Yeah, as you requested :P