0.2 version with many changes