merged changes from michael