updated on comments