Switch to tabs, add checks