Re-wrote get methods