Added auto resizing