Finished updates suggested by peter