Porting to this version 0.8 version