Added some funcions