some minor styling and a second version