Few more changes for clarity