Added/modified code