Posted by 5ofClubsI bought bassinet sheets and pnp sheets. I don't know about upgrading the mattress because it was fine for DS. And still is 2 yrs later