added better entry form