Lots of changes. Still not working.