Began smarter picture handling