bunch of changes for home users