Fixed all basic set ups