fix display
Merge branch 'expirmental-refactor' into dm-working