minor modifications here