[0.9.4-dev] big changes