Some improvment and missing form