FLORIAN's code

Modified