*got rid of redundancy