Added ability to change width and height