[DEV] change the parsing idea ...