Further component work