Reverting this back to utilizing a seperate operation.