more changes to manu (option 4 and 5)