New verisons
Initial 'keep selfie' logic