merged charly's changes