updated for latest constraints imposed by conject