Implemented Yoshini’s design round 2.