more changes for both options to look the same