Some methods changes, not sure about functionality