changed parsing arround