didn't totally resolve that conflict..