changes from first branch