initial changes to get it in working shape for 2.7...still doesn't work