Add Side setup minor changes