fix and improve, ready for press test