reworked testing and result
fix merge