New funcions and improvements