merged takashi's work with latest master work