Changes because of Feedback
SAD improvements