Updated width/height functions