it's all working now, without the bonus part