Restructuring / Restored previous functionality (I hope)