Maked some modifications.