added some functionality to #14