Submit Biraq's changes from last night. Will integrate later