Now combine both solutions to see if that works