As previously discussed, we should get rid of this