make all fields work