Joseph's revisions

Signed-off-by: Joseph Patrick Finnegan <jopfinn@gmail.com>