Updated to work with celluloid