added most stuff