Revamped for iOctOS 4.4.3