Added a few more braces for safety