Second commit. Changed some references