Reorganized in order to fix small compiling issue