Added final stuff. RC1