Modified extras a bit