Some clousures added