Added explicit control over width and height