Crash fixed. Feedback implemented