Reverted changes because they were crashing the app