added the last parts