snapshot
now properly rendering only when needed
now properly rendering only when needed #2
Merge Laszlos changes