Updated preEndState activation to work quicker