made data entry much easier
merged changes