added additional prefix logic.