reverted solution leaving tests