Updated changes..again..will this work?