Restructred for future assignments