Move validation
added 1 more event.
code stuffs.