Added other methods; still needs to be tested