update after commands and port to new collection