Updated v0.3  Better UI