removed rincewind stuff and added mock feature