added jeremy and locke