Final push of assignment time (minor changes)