original source code version 3.5.4