Dev 008 update to work with OF 008