New features

Added two and took out 1