final polish - 0.3 ready