Feel free to provide a better solution and I'll be happy to implement it.