Finished an enhanced static version