Adding and fixing.