replaced inputs with ready to use fields ...