FINAL SUBMISSION WITH FIXES