edit colin's changes