branching for issue1
updated to work with .6