Added code that was delete during previous merge