i've taken care of that part of things as well