wip
bug after comments fix
Merge branch 'design'