#28 modifications needed due to the merge with feature 29