commented func
fixed conflics