Fixing issues....Still a lot crash is there.