adding some of the 0.9 Features