Changes for testing on VM + some edits