implemented kevin's changes