little changes to #12