All the changes made @trikala-workstation