new features
refined sanity check