did a little restructuring
hope this works