Complete assignment

put to master?