Modified for version 3.0