Working on oF 0.8.0