added the new parts from the branch delfly_desperado2 in this branch