Added two paremeters and fixed an obvious problem with the "fill" method