Swtched to one liners