Reworked mounting and unmounting.
...