Bug fixes for 2. Still not working