diff --git a/Alfauzan_G231140202_UAS_JAVA.txt b/Alfauzan_G231140202_UAS_JAVA.txt
new file mode 100644
index 0000000..98eaf70
--- /dev/null
+++ b/Alfauzan_G231140202_UAS_JAVA.txt
@@ -0,0 +1,40 @@
+Nama	:	Alfauzan Rahmana R
+NIM	:	G.231.14.0202
+
+1. helloworld.java
+error > 	return new ModelAndView("welcome", "message", messages); 
+correction >	return new ModelAndView("welcome", "message", message);
+
+2. my-spring-servel.xml
+error >		<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">  
+        	<property name="prefix" value="/WEB-INF/jsp/" />  
+       	 	<property name="suffix" value=".xml" />  
+		</bean>  
+
+correction >	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">  
+        	<property name="prefix" value="/WEB-INF/jsp/" />  
+       	 	<property name="suffix" value=".jsp" />  
+		</bean>  
+
+3. my-spring-servel.xml
+error	>	<context:component-scan base-package="com.tobuku" />	
+correction >	<context:component-scan base-package="com.tobuku.controller" />
+
+4. pom.xml 
+	
+delete>	<dependency>
+    		<groupId>javax.servlet</groupId>
+    		<artifactId>javax.servlet-api</artifactId>
+    		<version>3.1.0</version>
+    		<scope>provided</scope>
+	</dependency> 
+
+5. web.xml
+error	>	<servlet-name>myspring</servlet-name>
+    		<url-pattern>*.html</url-pattern>
+    		<url-pattern>*.anything</url-pattern> 
+	
+	
+correction >	<servlet-name>my-spring</servlet-name>
+    		<url-pattern>*.html</url-pattern>
+    		<url-pattern>*.anything</url-pattern> 
\ No newline at end of file
diff --git a/WebContent/WEB-INF/my-spring-servlet.xml b/WebContent/WEB-INF/my-spring-servlet.xml
index 13bb73d..7f596b5 100755
--- a/WebContent/WEB-INF/my-spring-servlet.xml
+++ b/WebContent/WEB-INF/my-spring-servlet.xml
@@ -8,10 +8,10 @@ http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
 http://www.springframework.org/schema/context 
 http://www.springframework.org/schema/context/spring-context-4.2.xsd">
  
-	<context:component-scan base-package="com.tobuku" />
+	<context:component-scan base-package="com.tobuku.controller" />
  
 	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">  
         <property name="prefix" value="/WEB-INF/jsp/" />  
-        <property name="suffix" value=".xml" />  
+        <property name="suffix" value=".jsp" />  
     </bean>  
-</beans>
\ No newline at end of file
+</beans>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 22e8347..8fa1574 100755
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -18,8 +18,8 @@
         <load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet-mapping>
-        <servlet-name>myspring</servlet-name>
+        <servlet-name>my-spring</servlet-name>
 		<url-pattern>*.html</url-pattern>
         <url-pattern>*.anything</url-pattern>
 	</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/pom.xml b/pom.xml
index bdcff08..bddb66f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -37,12 +37,7 @@
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
 		</dependency>
-		<dependency>
-    		<groupId>javax.servlet</groupId>
-    		<artifactId>javax.servlet-api</artifactId>
-    		<version>3.1.0</version>
-    		<scope>provided</scope>
-		</dependency>
+		
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
@@ -71,4 +66,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/com/tobuku/controller/HelloWorld.java b/src/com/tobuku/controller/HelloWorld.java
index b7c50cf..5e54f1f 100755
--- a/src/com/tobuku/controller/HelloWorld.java
+++ b/src/com/tobuku/controller/HelloWorld.java
@@ -12,7 +12,7 @@ public ModelAndView helloWorld() {
 		String message = "<br><div style='text-align:center;'>"
 				+ "<h3>&lt;&lt;&lt; Ola, welcome to the Spring MVC World &gt;&gt;&gt;" 
 				+ "</h3><p>This message comes from <b>HelloWorld.java</b></div>";
-		return new ModelAndView("welcome", "message", messages); 
+		return new ModelAndView("welcome", "message", message); 
 		//Open the welcome.jsp and pass the message
 	}
 }