Added lines from SKWP