updated version 2 based on comment
commit based on comment