Partial update of 0.0.2-alpha