Added a few more changes for clarity