fixes for version 2