reverted last optimization