added space escaping