finally adding keith's commits