new functionalities and removed warning messages