restored some components