Updated Interface.
Cleaned up.