Change up how these will work