temp changes
temp changes resolved
major overhaul