merged new additions from everpix