[new] Fixed the form