rework ready for staging tests