Rewrote some part