added conditional, still goofy formatting