Copyright headers
Fix method returns
Cruft
Eliminated new state again - caused trouble
Comment