Updated to match engine v0.03