removed spring
added class 20