Some changes made even though it crashes