Completed

As discussed in messaging