Alfredo - Made some changes