New version that honors resize