Restructuring, everything works! The code is now ready for new weights