modified some methods to make it wisp compliant