refactored droidium implementation