edited serena's stuff