added a little fabric and removed unnecessary functionality