Structure changes, improved Gif rendering!