added another example and imported other features from will and ryan