readded lines 59-84