feature 3 further changes