updated for version 6.0