finished with Conditional assignment

Finally finished