Updated to function better with eclipseADK