Portfolio added, certain code removed.