added setup, made changes to introspection