Fixed further parts