Oakland specific modifications