version 0.3 cleaned