oops. bug fix and simpler