add in some features from cr-droid