Updated to OF 0.08