Improve photon stuff