changes as per Marty's review