added a lotta stuff