Revert "changes - crashes"

This reverts commit 140734cf99356117a304a8f9f9801ed59e9802cb.