Changed to use only one stub