FIXED AND ADDED