Added some slight modifications.