Rough add this addition..
Merge of minor stuff..