Assigment complete

Small changes may occur in future.