Minor changes. Still not working.