0.6.3a version (not complete)