added more wish code