Using auto insert now, removed needless functions