got rid of redundant fn