Removed conditional lines 67-70