Merged
Added missing code