Added all the curly braces I could think to add