added angular func. no checkbox func