Repaired after fail merge
Cleaned up