Version 5.0

Optimalisation added.