Version 0.4.0 - fresh approach