some mockup-changes