changes throughout to get to ver. 0.5