muchos changes and additional forms