bug fix w/ and implementation