almost ready for 0.3