Updated and add some shit (Testing)