Some minor changes. Still not working.