fix based on comments