after initial testing and reworking