huge performance improvement
temp/perm/cons fix