looks like i am fixing the collapse this time