Changed up messages and pom