Updated onCommand()-/create