Simplified all functions to just take size rather than width and height