added more fun and features