Updated after looking at potential solutions