better celluloid code