Completed also the bonus. Added some fix