[Anton] Simple/small optimisation + added the part name text