Changed wrap stuff. Can we haz merge Mr. trollcop?