Attempt to make it more reliable and up version to 1.0 as it's been in production for years.