major api change / 0.2