adjustments to base needed for Cypress port