reworked display, parseing extended