More porting of adonis-clone done