I'll work on a quick upgrade today/tomorrow