This is a merge of frank and my code

This is a merge from frank and my code