Local changes based on VM by Adnan