added parsing for proper output