Updated to latest format and cleaned runtime to minimal overhead