Merge of old and new - ready for testing of funtions as fragments