changes for more/better support