Works for now. Further testing needed.