updated policies; fixed issue #3