updated to work with 2.0 and cleaned up.