added initial support for 3.5