Have no idea any more why did I do all these changes