got working w redundancy
got rid of redundancy
final version, non-dupd