Updated to 0.1.1 style