Done with new whim moudle mockup