Updated some parts