Source change

Code is revised to adapt newest source format.