Jenny has a collection of marbles. She received 15 marbles as a gift from her friend. For her birthday, she received 10 more marbles. Jenny already had 1/3 of the total number of marbles she received as gifts before receiving them. How many marbles does Jenny have now? Let's think step by step and output the final answer within \boxed{}.
user