updated to use 3.0