Updated for version 2.04