modified to include testling