thank you baku for the code review. comments are coming