Update  : Assembly is seperated