Adding Guna's changes to the repository