added a second field (InputUnit) and did some other things