rerolled back
fixed activation panel