Added autoresize
Weird merge