Changed some stuff but florian will also add bits
updated from FJ's commit time