quick update to 0.9, should check if naming is correct