Change method to push and remove checktype