Same as last commit, but with bugfixes for bridge and sphere