Commented all methods back in