Changed Main (TEST)