Merged latest changes from Wes