adjusted to accomodate other classes in use