style: moving towards new concept