Updated alans changes with previous updates. Issue with auto update
Updating Alans stuff with previous updates. Issue with auto update