Commented out some lines to enable debugging...