Removed things I don't need, added one thing.
Fixed return