now working on 1.0.BETA.5