improve usage of fabric