cleaned up assignments branch