Changed a little
Ryu First Commit
Fixed conflict