Fixed a bug and added some functionality
interface