fixed bad alias of  plus slight refactor