added listing and some checks