Moarrrrrr data
adding {} on my ifs for Allan