Updated from debugging