changing to make both work