updated for todays stuff