Simplified and seems to be working nicely!