commented out some code
added correct dynamic variables