HUGE bug with update method on stars
Merge commit 'f1fe'