Some addition to the code, nothing major