Added some polish - second last revision