added calculated width & height to mapping