commented out some printlns & adjusted logic for testing