updated gernes to match the new architecture.