oops. properly working now