Merged Justin's changes with mine