Remove debug lines
Add volatiles