Updated master to run on my laptop