ongoing fixes for assignment
final