Trying to fix EE logic