Added values to height an width for better caching