refactored for Android Caustic projects