implemented some extra fun features, enjoy :)