small modifications, changing to new branch