Make use of the current_assignemts field
Put duplicated code into a function
Merge pull request #165 from guidow/use_current_assignments

Make use of the current_assignemts field