final changes for 0.3