duncanplee Final changes to version 5.2