Modified several parts