changed configurations and fixed forms