Changed to a simpler solution