Working Version
final changed asked by the project team added