Last version had some issues. Hopefully this is a more refined version.