Added back functionality for Android