updated to be more easily used