Restructed things a bit...
Added everything back