added california, fixed tax rate