add Part detection; remove sed command and FIXME comment