logic fix and identifiers