start fixing locla caceh handling