Addressed feedback on WIP PR