Now using @Component one time, deleted some blank lines.