Modified something by Gull.
Resolved conflict.