Merge Base Branch #3

fixes