edits from Keith and messing with thebigday (needs to fix)