merged with yugene changes
venue fix