CHANGE: 	-impoved stability
CHANGE: 	-adjustment to new database