Components updated to SP 2