Fixed Avijit's Mistakes