A bit more of design improvements. Don't be mad.