beginning to add support for 3.1