added calc support for width and height