adding leandros changes