updated with more fun