Added return calls to most methods