Adds recent changes from dev