At completion of hw4 with some additional feature checks