Minor changes, dropped the checkbox