Jetpack code commented out due to issue #16