updated some parts