[CORE] almost complete preview adding