added returns to all methods