Task #49 Change delivery forms.
Task #49 Add constraints.
Task #49 Remove commented code.