Updated for succinctness
Updated docs