Finally working for not yet parsed data

This is a major achievement