Minor update and mockup