Apv local

Adam merged his branch by creating a pull request.