updating for carnaby 0.1.7