Identified a few areas that may need to change