brought up to date with bitbucket stuff