Merge in Alana's changes from comiled source