merged kira´s stuff ...