adding {} on my ifs for Allan