up to date
merged player stuff