jesus bracket
fixed merges, moved code lower