move back to single file, critical fix to idLens!