parsing, trying to restore functionality