Reverted back to C++