improvements how this is parsing o/c