Changed paths for safety's sake