This method can probably be deprecated now