Removed a few notice + doc for new function