simplified main
simplified main, tests for new functions