Everything is working including the bonus and comments