Yes, this is more the way the code currently works in my workspace now.