upgrade 3.1

changing statics to private to make them work with 3.1 ... I believe this will also work with 3.0