adjust to new mappress setups